merge
authorTim Deegan <tim@xen.org>
Thu, 1 Dec 2011 17:24:12 +0000 (17:24 +0000)
committerTim Deegan <tim@xen.org>
Thu, 1 Dec 2011 17:24:12 +0000 (17:24 +0000)

Trivial merge